merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 12 Jan 2010 04:01:30 +0000 (13:01 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 12 Jan 2010 04:01:30 +0000 (13:01 +0900)

Trivial merge